gesturezoom: Just return a double in get_scale_delta()

Checking whether the gesture is active is a responsibility of the caller.

diff --git a/demos/gtk-demo/gestures.c b/demos/gtk-demo/gestures.c
index e9f80fcb346c4a3996c2a02c14eea0b2843b1ef3..9a414fc80b09afb2d88de1e1e95b228ba4084b71 100644 (file)
--- a/demos/gtk-demo/gestures.c
+++ b/demos/gtk-demo/gestures.c
@@ -96,8 +96,8 @@ drawing_area_draw (GtkWidget *widget,
       angle = gtk_gesture_rotate_get_angle_delta (GTK_GESTURE_ROTATE (rotate));
       cairo_matrix_rotate (&matrix, angle);
 
-      if (gtk_gesture_zoom_get_scale_delta (GTK_GESTURE_ZOOM (zoom), &scale))
-        cairo_matrix_scale (&matrix, scale, scale);
+      scale = gtk_gesture_zoom_get_scale_delta (GTK_GESTURE_ZOOM (zoom));
+      cairo_matrix_scale (&matrix, scale, scale);
 
       cairo_set_matrix (cr, &matrix);
       cairo_rectangle (cr, -100, -100, 200, 200);

diff --git a/gtk/gtkgesturezoom.c b/gtk/gtkgesturezoom.c
index 75d6a76e4bb601e6e8cda2121f523dae50ad3848..6fef52195b13f51d2be69c9fe54c8a80acc8fc88 100644 (file)
--- a/gtk/gtkgesturezoom.c
+++ b/gtk/gtkgesturezoom.c
@@ -191,17 +191,16 @@ gtk_gesture_zoom_new (GtkWidget *widget)
  * @gesture: a #GtkGestureZoom
  * @scale: (out) (transfer none): zoom delta
  *
- * If @controller is active, this function returns %TRUE and fills
- * in @scale with the zooming difference since the gesture was
- * recognized (hence the starting point is considered 1:1).
+ * If @gesture is active, this function returns the zooming difference
+ * since the gesture was recognized (hence the starting point is
+ * considered 1:1). If @gesture is not active, 1 is returned.
  *
  * Returns: %TRUE if @controller is recognizing a zoom gesture
  *
  * Since: 3.14
  **/
-gboolean
-gtk_gesture_zoom_get_scale_delta (GtkGestureZoom *gesture,
-                                  gdouble        *scale)
+gdouble
+gtk_gesture_zoom_get_scale_delta (GtkGestureZoom *gesture)
 {
   GtkGestureZoomPrivate *priv;
   gdouble distance;
@@ -209,12 +208,9 @@ gtk_gesture_zoom_get_scale_delta (GtkGestureZoom *gesture,
   g_return_val_if_fail (GTK_IS_GESTURE_ZOOM (gesture), FALSE);
 
   if (!_gtk_gesture_zoom_get_distance (gesture, &distance))
-    return FALSE;
+    return 1;
 
   priv = gtk_gesture_zoom_get_instance_private (gesture);
 
-  if (scale)
-    *scale = distance / priv->initial_distance;
-
-  return TRUE;
+  return distance / priv->initial_distance;
 }

diff --git a/gtk/gtkgesturezoom.h b/gtk/gtkgesturezoom.h
index 5ab2f4fe4e6c4c42d304c1df067de279668ffd54..555f937edcc4ff0293ed43edaf6f426b951b74fc 100644 (file)
--- a/gtk/gtkgesturezoom.h
+++ b/gtk/gtkgesturezoom.h
@@ -46,8 +46,7 @@ GDK_AVAILABLE_IN_3_14
 GtkGesture * gtk_gesture_zoom_new             (GtkWidget      *widget);
 
 GDK_AVAILABLE_IN_3_14
-gboolean     gtk_gesture_zoom_get_scale_delta (GtkGestureZoom *gesture,
-                                               gdouble        *scale);
+gdouble      gtk_gesture_zoom_get_scale_delta (GtkGestureZoom *gesture);
 
 G_END_DECLS